theme: Minor fixes from the 42 beta

Part-of: <https://gitlab.gnome.org/GNOME/gnome-shell/-/merge_requests/2206>

diff --git a/data/theme/gnome-shell-sass/_colors.scss b/data/theme/gnome-shell-sass/_colors.scss
index 55012a78db7a4f785eb2fdd25543f50f81cd7963..7dfe6662483ce5f54516acf5fe0a92e0da2a71a2 100644 (file)
--- a/data/theme/gnome-shell-sass/_colors.scss
+++ b/data/theme/gnome-shell-sass/_colors.scss
@@ -6,11 +6,11 @@ $bg_color: if($variant == 'light', #f6f5f4, lighten($base_color, 5%));
 $fg_color: if($variant == 'light', transparentize(black, .2), white);
 
 $selected_fg_color: #fff;
-$selected_bg_color: if($variant == 'light', #3584e4, #1c71d8);
+$selected_bg_color: #3584e4;
 $selected_borders_color: if($variant== 'light', darken($selected_bg_color, 15%), darken($selected_bg_color, 30%));
 
 $borders_color: if($variant == 'light', transparentize($fg_color, .5), transparentize($fg_color, .9));
-$borders_edge: if($variant == 'light', rgba(255,255,255,0.8), lighten($bg_color, 2%));
+$borders_edge: if($variant == 'light', rgba(255,255,255,0.8), lighten($bg_color, 5%));
 
 $link_color: if($variant == 'light', darken($selected_bg_color, 10%), lighten($selected_bg_color, 20%));
 $link_visited_color: if($variant == 'light', darken($selected_bg_color, 20%), lighten($selected_bg_color, 10%));

diff --git a/data/theme/gnome-shell-sass/widgets/_calendar.scss b/data/theme/gnome-shell-sass/widgets/_calendar.scss
index 43900b361d363cc8107688c456ce717d1008eeba..8d03ab90379f4877e60dfe48f7c2453a2cf47315 100644 (file)
--- a/data/theme/gnome-shell-sass/widgets/_calendar.scss
+++ b/data/theme/gnome-shell-sass/widgets/_calendar.scss
@@ -2,7 +2,7 @@
 
 // overall menu
 #calendarArea {
-  padding: $base_padding;
+  padding: $base_padding - 2px;
 }
 
 // Calendar menu side column

diff --git a/data/theme/gnome-shell-sass/widgets/_popovers.scss b/data/theme/gnome-shell-sass/widgets/_popovers.scss
index 06031b5598f5c42b0ec7d3898a2249f6193da3a2..fd5a02d4cb0ad5b1ea95c9c174377e4fe08a8fa3 100644 (file)
--- a/data/theme/gnome-shell-sass/widgets/_popovers.scss
+++ b/data/theme/gnome-shell-sass/widgets/_popovers.scss
@@ -21,8 +21,6 @@
 .popup-menu-content {
   padding: $base_padding;
   // account for margin oddities
-  padding-top: $base_padding - 2px !important;
-  padding-bottom: $base_padding - 2px !important;
   border-radius: $modal_radius - 2px;
   border: 1px solid $borders_edge;
   box-shadow: 0 2px 4px 0 rgba(0,0,0,0.1);
@@ -32,7 +30,6 @@
 // menu items
 .popup-menu-item {
   padding: $base_padding*1.5 $base_padding*2;
-  margin: 2px 0;
   border-radius: $base_border_radius;
   transition: 0.2s all ease;
   background-color: transparent;
@@ -128,7 +125,7 @@
 // separator
 .popup-separator-menu-item {
   padding:0;
-  margin: 4px 0;
+  margin: 6px 0;
 
   .popup-separator-menu-item-separator {
     height: 1px; //not really the whole box

diff --git a/data/theme/toggle-on.svg b/data/theme/toggle-on.svg
index 9646f9c237a8c8fc1a0e875bddffab101984d978..215760faf58ed47afb8f78043d7a50574e40b93b 100644 (file)
--- a/data/theme/toggle-on.svg
+++ b/data/theme/toggle-on.svg
@@ -1 +1 @@
-<svg width="48" height="26" xmlns="http://www.w3.org/2000/svg"><g transform="translate(0 -291.18)"><rect style="fill:#1c71d8;stroke:none;stroke-width:1;marker:none" width="48" height="26" y="291.18" ry="13" fill="#3081e3" rx="13"/><rect ry="11" rx="11" y="294.18" x="24" height="22" width="22" style="fill:#000;fill-opacity:.2;stroke:none;stroke-width:.999999;marker:none" fill="#f8f7f7"/><rect ry="11" rx="11" y="293.18" x="24" height="22" width="22" style="fill:#fff;stroke:none;stroke-width:.999999;marker:none" fill="#f8f7f7"/></g></svg>
\ No newline at end of file
+<svg width="48" height="26" xmlns="http://www.w3.org/2000/svg"><g transform="translate(0 -291.18)"><rect style="fill:#3584e4;stroke:none;stroke-width:1;marker:none" width="48" height="26" y="291.18" ry="13" fill="#3081e3" rx="13"/><rect ry="11" rx="11" y="294.18" x="24" height="22" width="22" style="fill:#000;fill-opacity:.2;stroke:none;stroke-width:.999999;marker:none" fill="#f8f7f7"/><rect ry="11" rx="11" y="293.18" x="24" height="22" width="22" style="fill:#fff;stroke:none;stroke-width:.999999;marker:none" fill="#f8f7f7"/></g></svg>
\ No newline at end of file